Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 17 Sep 2014 19:15:28 +0000 (20:15 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 17 Sep 2014 19:15:28 +0000 (20:15 +0100)
commitf8315ea4f0657dcd7f0bc5bec1328c522b0ceb83
tree62f5c65784cea59c9ca867a9b34894d0903e4271
parent5fc4efcd3defde429bb048f89decb2ffd96d1c11
parent72af6f455ac6afcd46d9a556f90349f2397507e8
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging